Edit the controllers to work
Merge branch 'master' of github.com:stutern/stuternbeta