Merge branch 'master' of github.com:Rovanion/SuperHappyFunTime into fix