Merged a pull request from Wakkos