checkpoint...when out of draw mode, go to simulator mode right away.
Merge branch 'master' into gh-pages