Branch Fixes
Merge pull request #1 from thandaanda/controllerfix

Branch Fixes