Some fixes into Sensor MO
Merge pull request #54 from javierhe/master

Sensor MO fixes