Merge pull request #75 from nicksavers/master

Multiple performance fixes
1. Getting the tace back after last merge