fixed simulator bug
Merge branch 'robDev'
fixed simulator bug