Merge pull request #7 from Google-Drought/master

Branch merge for parity.