Develop

Most of sensers test OK, merge.