Add new option `expand`
Merge pull request #23 from artch/expand

Add new option `expand`