Fixes
Merge branch 'master' of https://github.com/maestros/ES_Cloud_Group