new controller on this branch
Merge pull request #1 from kratsg/new_controller

new controller on this branch