Big update for task inside.
style fix.
Merge pull request #109 from fotavo/task

Task