Feature/task 1686

Please merge my pull request.