added weather
Merged kelpine/master