updated controllers
Merge pull request #2 from aryssdal/ADAM_R

updated controllers