Better readme & full macro support