fx bugs
Merge pull request #2 from lichenhao/master

合并？？