Add controllers
Update controllers
Merge pull request #5 from stefankp/controllers

Controllers