Merge pull request #16 from casidiablo/develop

Refactoring to make callbacks from tasks more sexy :octocat: