Added main structure
Merge pull request #2 from koencolpaert/expand201412143

Added main structure