Sync
Merge pull request #19 from parallaxinc/master

Sync
Merge branch 'master' into Sensors