Merge pull request #134 from alxdarksage/develop

Merging fixes
Merge pull request #135 from alxdarksage/develop

Fixing test
Updating to force redeployment to Heroku