Merge pull request #121 from chylex/master

Added more stuff to TC integration
Needs this
Merge pull request #62 from ProPercivalalb/master

Gimme updates!