fixed github handle issue and added controllers
Merge pull request #25 from henrytwang/update_controllers

fixed github handle issue and added controllers