Merge pull request #1 from yuquanZhu/master

c2
second pull
Merge pull request #2 from srrrr/master

123