Fixes for pull req. #263 as suggested
Added util/macros.h - ups
Merge pull request #268 from TNick/remove-warnings

Remove warnings

thanks