Updated tm module.  Merged with master