updated git macros
Merge branch 'master' into work