Done issue #254
Merge pull request #288 from Gudini/task

Done issue #254