Merge pull request #1 from cuijiao/R-1

first commit
second commit
dd
solve conflits