Merge pull request #7 from Google-Drought/master

Branch merge for parity.
Merge pull request #17 from Google-Drought/development

Merge pull request #7 from Google-Drought/master