Task update
Merge pull request #254 from jmpascal/MERGING-1

Task update