Merge remote branch 'github/pr/35'

This closes #35

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