Merge remote branch 'DeadZen:patch-1'

This closes #20

Signed-off-by: ILYA Khlopotov <iilyak@apache.org>