lhy_3
Merge pull request #15 from liuge1990n/master

lhy 1.3
Merge pull request #16 from chrismacong/liuge_upload

Liuge upload