TM changes
Merge pull request #34 from cnd11/master

Updates