Upgrade macro to also have a tag, and minor formatting changes.
Indentation!
Merge remote-tracking branch 'origin/master' into consumables