Improvements to expiration date setting
Merge pull request #10 from Crowdtilt/exp-date

Improvements to expiration date setting