Fixed API source (MP2-375)
Updated helper (MP2-375)
Merge branch 'FIX_WeatherAPI' into EXP_WiP