fixes #34, fixes #33, fixes #32, fixes #31
Merge pull request #126 from Team-Delta/task-974

fixes #34, fixes #33, fixes #32, fixes #31