Merge pull request #93 from Doha2012/master

Modify FOP configurations
Merge pull request #94 from Doha2012/master

Modify fop
small fop changes
Change encoding