Some Controller action :)
Merge branch 'master' of github.com:MartinForre/odin