Merge pull request #789 from gaelj/BFmsp_protocol.h