Merge pull request #50 from painless-security/jennifer/refactoring_tids