closes #19 and closes #20
Merge pull request #28 from gunnertech/expiration-stuff

closes #19 and closes #20