Commit 2013-10-05
Experiment with mappings for macros