Add Comoros
Merge branch 'comoros' into custom