Merge pull request #854 from KevWright/master

Trying to troubleshoot a macro issue
Merge pull request #855 from KevWright/master

Trying to troubleshoot a macro issue
Fixed some example snippets