Merge pull request #6 from jdestradap/fix_controllers

Fix controllers