Added stuff
Various changes
Merge branch 'master' into uCtrlDevices
Fixed
Merge branch 'uCtrlDevices'