Fixing issue #44 github.com