Merge remote branch 'github/pr/160'

This closes #160

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