Merge pull request #308 from gtoonstra/skytraq_fix

Skytraq fix