Merge pull request #2 from ZomgPonies/master

Merge pull request #499 from Markolie/master
Debugging
Merge pull request #503 from Markolie/master

Debugging for crashing
Merge branch 'master' of https://github.com/ZomgPonies/Paradise