closes #178
patch 1
Merge pull request #179 from Team-Delta/task-1110

closes #178