pcwalton Merge pull request #4 from fzzzy/master