Closes #684 (closed)
Einige arge Fehler behoben.
This will create a new commit in order to revert the existing changes.
