Merge pull request #2 from fywb251/master

afds