Works on Red Hat.
Merge branch 'master' into linux
Compiles and runs on OS X and Linux both (I hope)