Merge pull request #44 from jvish/review

Review