Merge pull request #2 from ioquake/master

Sorry about this.
How can i delete this pull request?