changes for super ambassador
Merged from upstream
Super ambassador feature
Merge pull request #157 from sparkica/fea_ambassador

Fea ambassador