multiple zumo/controller support
merged changes (working between Mac and Pi)