Better semantics in Controller
Merge branch 'master' of git://github.com/erpk/harserver