Merge pull request #241 from jwendl/master

Merging changes to mainline.
Merge pull request #58 from Magenic/master

Merge pull request #241 from jwendl/master