Structure fix
Merge pull request #3 from Crosscheck/extended-features

Structure fix