Implement unexpand
Merge pull request #372 from Armavica/unexpand

Implement unexpand