Merge pull request #51 from ferd/evanmcc-trace-fn

Evanmcc trace fn