0.1.6

Improved macro naming convention.
Merge pull request #9166 from murraysagal/master

0.1.6