Merge pull request #1 from freeman0432/master

pull
wangmin.c

asdf
Merge pull request #2 from CrazyWang/master

pull