created watch task and improvements in code
Merge pull request #3 from EvandroLG/master

created watch task and improvements in code