Added test
Merge branch 'master' of https://github.com/siad007/Fop