lhy_2
Merge pull request #13 from liuge1990n/master

lhy 1.2
Merge pull request #14 from chrismacong/liuge_upload

Liuge upload