Updated for language changes to macros.
Merge pull request #126 from aatxe/master

Updated for language changes to macros.