Merge with mangosfour

Merge with mangosfour