Updated some docs and added MacroDemo