Merge pull request #46 from TheWeatherCompany/develop

TWC changes