minor
Merge branch 'master' into hokuyo_issues