Merge pull request #2 from qsjia/master