added Sherry
Merge branch 'master' of git://github.com/anidev/612-2013
Merge pull request #12 from SherryFeng/master

changed Authors