Revert "Merge develop into issue-152"
Merge pull request #94 from TheWeatherCompany/revert-93-develop

Revert "Merge develop into issue-152"