Merge remote branch 'DeadZen:patch-1' master
authorILYA Khlopotov <iilyak@apache.org>
Fri, 14 Oct 2016 18:39:36 +0000 (11:39 -0700)
committerILYA Khlopotov <iilyak@apache.org>
Fri, 14 Oct 2016 18:39:36 +0000 (11:39 -0700)
This closes #20

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

Trivial merge