Fixed bug #39 with better backup scheme.
Merge branch 'master' into addpoppler