adding Server#join

Recreated PR because of a branch reorganization.