Merge pull request #2 from fabiberlin/master

moep