Merge remote branch 'github/pr/152'

This closes #152

Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>