Merge pull request #3 from fweber-de/master

merge
Merge pull request #4 from fweber-de/dev

Merge pull request #3 from fweber-de/master