Task 1056 closes #130
Merge pull request #133 from Team-Delta/task-1056

Task 1056 closes #130