closes #1100, closes #1103
patch 1
Merge pull request #136 from Team-Delta/task-1103-1100

closes #1100, closes #1103