closes #186
patch 1
Merge pull request #202 from Team-Delta/task-1510

closes #186