Merge pull request #195 from jwendl/master

Fixing compat issues.