Fixed some bugs
Merge branch 'master' of github.com:Hasan-Jawaheri/FTS-Arcade