Working for CloudCom Demo
Merge branch 'master' of https://github.com/tuwiendsg/COMOT