Added controllers
Merge pull request #2 from hoi/controllers

Added controllers