Fixes Issue-208
Fixes issue-225
Fixes issue-225
Merge pull request #209 from Team-Delta/issue-208

Fixes Issue-208