controller fixing
Merge pull request #9 from Pouncealot/master

Controller fixing