CLI/SRV base code
Merge branch 'master' of https://github.com/mr-hermit/cli_srv_test