update from li wang
Merge pull request #2 from scdong/master

update from li wang