Merge branch 'release/0.2.2' into dev
added missing controller
Merge branch 'dev'