closes #218 #219 #217 #216 #215 #214 #213 #206
patch 1
Merge pull request #220 from Team-Delta/task-1504

closes #218 #219 #217 #216 #215 #214 #213 #206
patch 1