fixed weather to use codes
Merge remote-tracking branch 'origin/master'