Structure
Merge pull request #135 from bholzer/master

Structure