remodeled sensor
remodeled sensors close #47
Merge branch 'sensor' into dev