more weather code clean-up
Merge pull request #10 from b0nk/master

more weather code clean-up