Merge pull request #723 from flyinglemonfpv/master