Merge pull request #1 from xsaz71/master

Merge pull request #1 from Yan-Shen-Hong/master
Merge pull request #2 from Yan-Shen-Hong/master

Merge pull request #1 from xsaz71/master