Trying to fix issues when running on server
Merge branch 'master' of https://github.com/CraigDem/amazonhack