Controller update
Merge branch 'master' of https://github.com/Blackflunk/CDIO3.git