updated master branch to run on the server