Changes as per test result
Merge branch 'master' of https://github.com/jay-allianz/addons_sunprosolar