closes #160
Merge pull request #161 from Team-Delta/task-1121

closes #160