rel. 0.6: code refactored

code simplifaction, more comments
Merge branch 'master' into sensors