Merge pull request #12 from PX4/master

update beta from master branch
Merge branch 'master' into beta
Merge pull request #16 from PX4/beta

Beta