Merge pull request #2 from vinayr/master

Merge pull request #1 from vinayr/serverfix
Revert "Merge pull request #1 from vinayr/serverfix"
Merge pull request #3 from vinayr/revert-2-master

Revert "Merge pull request #1 from vinayr/serverfix"