+1
added some more macros as quick hack...