Merge pull request #22 from xiatao123/master

finished fav