Code updates and fixes from Dave Vernier.
Merge branch 'master' of github.com:VernierSoftwareTechnology/arduino