Merge pull request #46 from TheWeatherCompany/develop

TWC changes
Merge pull request #12 from greese/develop

Merge pull request #46 from TheWeatherCompany/develop