Fixes #25  most of the part was already committed this was missing. With the modification request for CANCEL_OR_REFUND