Merge pull request #51 from painless-security/jennifer/monitoring_client_and_server