Add tasks
Merge pull request #338 from gannetson/tasks

Add tasks