Nicolas pull request