Merge remote branch 'github/pr/45'

This closes #45

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