commit from liaotonglang
Merge pull request #1 from quant67/master

commit from liaotonglang