adding the base_options and removing duplicate options / functions
Merge pull request #53 from sbotman/add_base_to_cs_server_stop

adding the base_options and removing duplicate options / functions