Merge pull request #18 from gaojun2048/master