refactored example controller
Merge branch 'dev'