Merge pull request #1 from vinayr/serverfix

fix server
Merge pull request #2 from vinayr/master

Merge pull request #1 from vinayr/serverfix