Sensor

Merging the sensor changes into master