merge
Merge pull request #6 from joergkappes/master

merge pullrequest of thorsten