Merge pull request #78 from Epihedron/tcbranch

clean up