Fixing issue #44 github.com
Fixing github.com issue #36