lergo-399 and build 699-review-comments
Merge pull request #174 from lergo/lergo-399

lergo-399 and build 699-review-comments