lhy06
Merge pull request #31 from liuge1990n/master

lhy1.7
Merge pull request #32 from chrismacong/liuge_upload

Liuge upload