fix
Merge remote-tracking branch 'spa/dumb' into dumb

Conflicts:
	lib/server_socket.rb
fixes