Initial solution
Merge pull request #1 from dxenakis/intial-tasks

Initial solution