14.10.27部分修改
Merge pull request #37 from overmoon/master

my14.10.27
Merge pull request #38 from chrismacong/halfmoon'sempty_upload

Halfmoon'sempty upload