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

Wand tm cleanup2