Merge remote branch 'github/pr/1'

This closes #1

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