fix expiring value to be in seconds
Merge branch 'hotfix/0.9.5'