Fixed exchange expire
Merge pull request #50 from telehash/fix-exchange-expire

Fixed exchange expire