Cleaned up trace_wrap()
Merge pull request #2 from Mystor/master

Cool stuff