test by kuangkuang
Merge pull request #1 from kuangkuang/master

test by kuang