task refactor
Merge pull request #341 from patrickarlt/master

Refactor Tasks