closes #187
patch 1
Merge pull request #197 from Team-Delta/task-1514

closes #187
patch 1