Merge pull request #213 from jwendl/master

Fixing issues related to #210 and #208
Merge pull request #53 from Magenic/master

Merge pull request #213 from jwendl/master