Try to correct some stuff
Merge branch 'master' of github.com:BinaryBrain/MonsterFriends