Addressed feedback in #4, attached interdiff for same. please review