#195 onCancel & onClose now optionally take an argument