ticket:40 macro refactored
2 files changed