Merge pull request Latest from nightscout/master

update original