removed 16 macros from master
=> moved to branch 16macros