Merge pull request #2 from WOYM/master

Merge WOYM:master
Merge pull request #3 from WOYM/master

Merge WOYM:master
#97 und #101 erledigt.
Fehler behoben.
Merge pull request #105 from alueck/master

#105 review ok