fixed controllers
catbug
Merge pull request #5 from sanghal/master

kjkjh