macros and protocols wording fixes
Merge pull request #123 from rilian/master

macros and protocols wording fixes