Merge pull request #407 from ping19/master

Working achievements
Tidy up debug
Merge pull request #408 from ping19/master

Fix game crash
Merge remote-tracking branch 'upstream/master'