move fixture back to master.
Merge pull request #17 from nanliu/fixture

move fixture back to master.