Merge pull request #665 from wozz/exchange-value