Fixes #23 Closes #22
Merge branch 'develop' of github.com:frakbot/FWeather into develop