Merge pull request #167 from jwendl/master

Fixing issues.
Merge pull request #44 from Magenic/master

Merge pull request #167 from jwendl/master