Fixes bug #38
Merge branch 'master' into addpoppler