add more computed macros
Merge pull request #2219 from tchak/computed-macros

add more computed macros