updated controller
Merge pull request #8 from JoyP/acceptance

updated controller