Fixes
Merge branch 'Beta' of https://github.com/esfdk/DarkForest into Beta