Merge pull request #1 from Lawlez/master

pull