Merge PR#356 from 'b4n/techee/tm'