Server bugfix
Merge pull request #5 from jayseejc/Working

Server bugfix