latest changes
Merge branch 'master' of github.com:hartantothio/clueless