WIP
WIP
WIP
Merge pull request #7 from milasudril/wand-tm-cleanup2

Wand tm cleanup2