Added ping/pong support #32