closes #195 and  #196
patch 1
Merge pull request #221 from Team-Delta/task-1101

Task 1101