Merge pull request #44 from 30x/XAPID-931

XAPID-931: change expiration time to seconds