closes #124
Merge pull request #125 from Team-Delta/task-1057

closes #124