Merge pull request #1 from winkelement/master

Erster Test
Netbeans test
Merge pull request #1 from andirotter/master

Update