fix bugs
Merge branch 'master' of https://github.com/kukucat0322/Gtroo
fix bugs