0.1.6

Improved macro naming convention.