Decorated tag

Fixes #99