Added one of two fixes to see if this fixes build in Jenkins. To be
immediately merged with dev to start testing and build verification.
Merge pull request #7 from frenchie16/client_server_dev

Added one of two fixes to see if this fixes build in Jenkins. To be