closes #173
Merge pull request #176 from Team-Delta/task-1112

closes #173