closes #181, closes #182
Merge pull request #184 from Team-Delta/task-1102

closes #181, closes #182