Minor fix: debug option
Merge branch 'master' into motor