Merge pull request #2 from gaojun2048/master