closes #155
Merge pull request #156 from Team-Delta/task-874

closes #155