Fix for TaskServce
Merge branch 'master' of github.com:plribeiro3000/happy_rep