review comments
Merge pull request #352 from erendrake/review_comments

review comments