bug fixes
Merge branch 'master' of https://github.com/Juwce/Hot-Not