added weather function
Merge remote-tracking branch 'upstream/master'