Merge pull request #6 from ikenchina/master

b
d e
add temp file
Merge branches 'master' and 'temp'
Merge branch 'temp'
Merge pull request #10 from 6225276/master

fd