Merge pull request #236 from jamiehannaford/server-list-opts

Adding Server list opts