Fixed some stuff
Merge branch 'master' of https://github.com/AndrewCarvalho/Tojam8