prototype
Merge pull request #1 from maxtillich/develop

prototype