Merge pull request #28 from jvish/review

Review
Merge branch 'upstream/master'