Merge pull request #182 from jix/taskloop