#158 - improve support for macros
edit changelog