Merge pull request #1 from vinayr/serverfix

fix server