Add task scheduling
Merge pull request #108 from andreia/master

Add task scheduling