tasks working
Merge pull request #33 from diegosarmentero/master

tasks working