minor changes
Merge branch 'newmaster' of https://github.com/mujin/mujincontrollerclientpy into newmaster