Merge pull request #1 from nightscout/source

catch up
Merge pull request #17 from wagnerpe/source

pull updates from patty