Fixes by jk
Merge branch 'feature' of github.com:ilyashir/segway-ctrl into feature