WIP task handler
Merge pull request #192 from Somesh/master

WIP task handler