Never mind, I see this PR has already been merged. I'll make the changes in my previous comment and submit a new PR.