Bug #46: Fixing expiry date computation
Merge pull request #1 from smillie/master

Bug #46: Fix user expiry date calculation