Not tested locally due to Heroku freezing, but let's try it on Travis
Merge pull request #171 from alxdarksage/develop

Not tested locally due to Heroku freezing, but let's try it on Travis