Additional changes
Merge branch 'master' of https://github.com/evertheylen/freakingmath-hack