Merge pull request #26 from PengyRS/master

update my branch