Merge pull request #1 from PX4/master

Update