Update to version 1.2
Merge branch 'refs/heads/WIP/api-1.1-controller'