closes #47
Merge pull request #96 from Team-Delta/task-894

closes #47