Merge pull request #38 from jvish/review

Review