Merge pull request #1 from dirkliu/dev

test.txt
Merge pull request #2 from dirkliu/master

Merge pull request #1 from dirkliu/dev