Fix #53 Same Paper Cannot Be Connected Twice

This PR includes the work on client made by @tdurieux