theqwang's pull request