Merge pull request #1 from aucor/master

Fixes for Servo