protocol bug fixed and test request
Merge remote-tracking branch 'origin/master'