Fix and improve (make compatible with the do task)
Merge pull request #1 from mtopolnik/master

Fix and improvement to thrush