Merge pull request #1 from ameske/master

MERGE
update & fixed bugs
CTRL ID changed
merge
Update sensor with testcases