Merge pull request #3 from PopPopRet/master

merge
refine