Controller changes.
Merge branch 'master' of github.com:michaelpetrov/paper-unicorn-attack