#66,#62
Merge pull request #79 from fotavo/task-inside

#66,#62