experimental macro support

fixed