control tracking
Merge branch 'master' of https://github.com/jlh752/wm-sim
control tracking