Add Main to Client Message Handler
Merge remote-tracking branch 'origin/master'