Merge pull request #302 from gpakosz/align-macros