Make the server name more exact
Merge pull request #26 from chrishodson/master

Make the server name matching more exact