Merge pull request #1070 from techee/tm_move