Merge pull request #21 from causten/sensors

Updated to sensor2 features