Misc
Merge branch 'master' of github.com:rapuckett/trace