Improvements
Merge branch 'master' of https://github.com/ADNBP/CloudFrameWork
improvements