Changing this because it fails on deployment
Merge pull request #167 from alxdarksage/develop

Changing this because it fails on deployment