closes #146
Merge pull request #153 from Team-Delta/task-1122

closes #146