Update --structure option
Merge pull request #508 from Riges/patch-3

Update --structure option