Cleanup
Merge branch 'master' of github.com:greg42/simple-secure-channel