Added chapter on macros