Merge pull request #2 from ricin123/master

pull ssss