Fixed functions
Merge branch 'master' of https://github.com/Joshun/rpg-game