Added Custom Message Encoder
Merge