proper logic
Merge pull request #2 from ankhers/unnecessary_server

proper logic