changed controller stuff
Merge pull request #3 from hamberguesa/jd_controller

changed controller stuff