Merge pull request #1 from houyafeng/master

I added a greate functionalitiy please merge it !