Tidied up macros and updated version number
Renamed Macros to CoreMacros to avoid conflict
More macro tidyup