Merge pull request #451 from madewokherd/wrappertrace