initial dev
Merge pull request #1 from erikvan/develop

initial dev