Add features
Merge branch 'master' of https://github.com/RistoSan/baseline

* 'master' of https://github.com/RistoSan/baseline:
  Add Controller