Add cheat mode
Merge branch 'develop'