Merged some changes from https://github.com/ciex/simpleWeather (pull request #3) into master.