fixes #6219 - add --server cli option
Merge pull request #129 from thomasmckay/6219-server-option

fixes #6219 - add --server cli option