Implement expand
Merge pull request #370 from Armavica/expand

Implement expand