Bug fixing n stuff
Merge branch 'master' of https://github.com/hartantothio/clueless