more fixes
Merge pull request #10 from Pouncealot/master

Controller fixing