Mango

Merge Mango integration into master branch