Merge pull request #2 from nightscout/master

Pull