Merge pull request #35 from wendong112/master

update for tct 2.1