Merge pull request #15 from WOYM/master

aktualisierung
Merge pull request #141 from alueck/master

#136 erledigt
Merge pull request #16 from WOYM/master

aktualisierung
save commit
Merge pull request #144 from JurSch/master

Adrians request
Merge pull request #9 from WOYM/master

merge