Fixed a bug
Merge branch 'master' of https://github.com/teamgameproduction/tt