WP fix contributed by James Goppert
Merge pull request #146 from PX4/wpfix

WP fix contributed by James Goppert