Added a controller to the example
Merge branch 'master' into development