added fix to segfault
Merge branch 'master' of git://github.com/JordanToering/MushroomKingdom