Merge pull request #1 from fzzzy/master

Small changes, r=yurenju
Supported zip file
Resolve conflicts