Updated for changes to macros requiring semicolons.
Merge pull request #28 from aatxe/master

Updated for changes to macros requiring semicolons.