Fixed Controller
Merge pull request #13 from funnythingz/controller

Fixed Controller