review comments
Merge pull request #402 from erendrake/review_comments

review comments