set resolution to 10ms
Merge branch 'master' into wj_dev