Requested feature from @jphayes 