Merge pull request #58 from jvish/review

Review