Merge pull request #22 from PengyRS/master

update my branch