closes #150
Merge pull request #151 from Team-Delta/1046

closes #150