Added an option for macros, and a couple of examples