Issue/1068/voucher improvements

Allow vouchers to be valid for specific times.