ported @someoneAnyone's fixes from #244/#246
Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into dev