Merge remote branch 'github/pr/18'

This closes #18

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