Merge pull request #2 from sjahns/bla2

branches zusammenführen