Merge pull request #8 from brint/master

Added tests, updated default hostname, upped server count