test pull request
Merge pull request #1 from coderjson/master

fix bug