Merge pull request #2 from fabiberlin/master

moep
Merge pull request #3 from fabiberlin/TEST

Merge pull request #2 from fabiberlin/master