Revert "merge in upstream changes"
Merge pull request #22 from TheWeatherCompany/revert-21-develop

Revert "merge in upstream changes"