Reverted to Merge pull request #39 plus changed message type descriptions.