Merge pull request #1 from shijieru/jierus

jierus first commit
afsdgsdgsgdsgd
Merge pull request #2 from shijieru/keli

afsdgsdgsgdsgd
jierus second commit