controller setup
Merge pull request #7 from Pouncealot/master

controller setup