Merge pull request #3 from fweber-de/master

merge