More robust CTCP implementation
Merge
Merge