Merge pull request #1 from patrickarlt/feature-find-task

Feature find task