Updated code so that it works on the new cluster
Merge pull request #5 from fabuzaid21/master

Updated code so that it works on the new cluster