Merge pull request #28 from Magenic/master

Merge pull request #97 from jwendl/master
Fixing issue #65
Merge pull request #99 from jwendl/master

Fixing issue #65