moved acceptor implementation to header
merge fix