Updated for macro changes requiring semicolons.
Merge pull request #56 from aatxe/master

Updated for macro changes requiring semicolons.