Simplified task
Merge pull request #187 from troopjs/feature/task-simplification

Feature/task simplification