Merge pull request #40 from TheWeatherCompany/develop

merge dev into windows support
removed unecessary conditionals
Merge pull request #41 from TheWeatherCompany/windows-support

Windows support