Change macros style
Update to 2.0.6