Merge pull request #195 from jwendl/master

Fixing compat issues.
Merge pull request #49 from Magenic/master

Merge pull request #195 from jwendl/master