Build 633 review comments
Merge pull request #162 from lergo/build-633-review-comments

Build 633 review comments