Merge pull request #19 from ijansch/master

Compatibility fixes
Merge remote-tracking branch 'upstream/master'