Merge tracing framework
Merge pull request #19 from jcnelson/master

Merge tracing framework