Fixed message sending bug
Merge branch 'master' into chrome