Improved controller class
Merge branch 'master' of https://github.com/detorto/mariobot
asd