Merge pull request #227 from fabienrohrer/master

Hopefully fixed the overheating issue on the DARwIn-OP
Merge pull request #228 from fabienrohrer/master

Fixed compilation issue
untested change

untested