Merge pull request #7 from radiocontrolled/00004858