Refactor task handling a little bit...
Readme