closes #172
Merge pull request #180 from Team-Delta/task-1115

closes #172