See #67
Merge pull request #111 from haf/patch-1

See #67