Fixes bug #52
Merge branch 'master' into addpoppler
Merge branch 'addpoppler' into glib_new