Aww Yiss.
Merge branch 'master' of github.com:Mikeygoo/trace-c.git