closes #129 closes #128
patch 1
Merge pull request #147 from Team-Delta/task-1099-1097

closes #129 closes #128