new version
Merge pull request #41 from pfischi/develop

new version