Modify fop
Merge pull request #94 from Doha2012/master

Modify fop