Added delimitMate
Merged remote