allow for construction by expiry date and for receiver and payer swaptions
add missing return statement
Merge pull request #52.
Merge remote-tracking branch: upstream/master