basic structure
Merge pull request #1 from danse/develop

basic structure