Merge remote-tracking branch 'nbites/master' into station3
Merge branch 'master' into station3
put in more context checks for center circle