Ok, I merged this, so could you update this pull request with the needed changes?