Merge pull request #2 from satnogs/master

Pull latest