Fixing issue #112
Merge pull request #30 from alexweissman/master

Fixing issue #112