Issue #25 got round trip working