2007-04-09 insilmaril Started implementation of macros