Fixing the build.
Merge branch 'master' of https://github.com/amsomniac/freezing-ninja