Christian Holub's pull request