Merge pull request #15 from laichendong/master

update
Merge pull request #16 from laichendong/master

update
Merge pull request #11 from lee52547/master

update