Allow the --server flag to be disabled
Merge pull request #28 from parndt/parndt_refactor

Allow the --server flag to be disabled