Merge pull request #1 from nightscout/master

Update from Master NS.