Compatibility tweaks for OS X/linux
Merge branch 'master' of https://github.com/luukvisser/OSCAAR