Se7eN's pull request