Sync Mangos and cMangos changes

Bring Mangos upto date - Thanks cMangos