;ergo-246 : review comments
Merge pull request #111 from lergo/lergo-172-final-commit

;ergo-246 : review comments