Working controller test
Merging updated code with working controller test

Merge branch 'master' of https://github.com/ionambrinoc/raspberry