Made the Mac version compile and run.
Merge branch 'release/0.02'