Pull Request for Fork Johannes to new Version