Merge pull request #1 from laganiere/master

controller added