Merge pull request #8 from Neoracle/master

sync with jianwei
Merge pull request #9 from Neoracle/master

sync
done swaption annuity numeraire

done swaption annuity numeraire
Merge pull request #49 from michaelhukun/master

pull