Quantlib merge

thanks to Peter Caspers