update master to credit russell and brandon
Merge branch 'master' into crossSimulator