Merge pull request #9 from nightscout/master

Update GCW local master repo with NS Master for 0.5.0 release
Merge pull request #11 from gregwaehner/master

Merge pull request #9 from nightscout/master