Manueller Merge von Pull Request #8