Fix protocol
Added image message support
Fix merge