Merge @philzen pull request