closes #131
patch 1
Merge pull request #132 from Team-Delta/task-889

closes #131