closes #27, closes #88
Merge pull request #89 from Team-Delta/task-903-872

closes #27, closes #88