formatting
Merge pull request #41 from p1tz/master

merged
Merge pull request #21 from diejen/master

sync
Merge pull request #22 from p1tz/master

sync
Merge pull request #23 from arago/master

sync
Merge pull request #3 from viteke/master

Abgleich