Add more expiration options

Resolves issue #58.