Bugs correction
Merge branch 'master' of https://github.com/suiko1984/AreaQuest