Merge pull request #1 from svengiesen/master

Test Test
version 5 blabla
Merge pull request #1 from FelixWeis/master

test 123