Fix OSX errors.
Merge branch 'master' of https://github.com/Ant2i/FRE4
Fix OSX errors.