FIXES, DAMN YOU!
Merge branch 'master' of https://github.com/SmilyOrg/CodenameSnowman ALSO HOPEFULLY SOME FIXES!
Merge branch 'master' of https://github.com/SmilyOrg/CodenameSnowman