Added sensor classes
Merged with master