Merge pull request #236 from fabienrohrer/master

Improved remote-control code