Merge pull request #2 from liqiangtq/master

Merge pull request #1 from liqiangtq/Qw