Fixed some issues
Merge branch 'master' of https://github.com/lucazulian/code4playhackathon