Merge github.com:cbaillie/EdSensor
Merge github.com:cbaillie/EdSensor

Merging with Github version.