fixed macro inclusion & comments
Merge branch 'master' of https://github.com/OpenCMISS-Utils/utilities