Use the Decorator trait rather than workarounds
Merge pull request #19 from cmr/decorator

Use the Decorator trait rather than workarounds