bringing my fork up to date with original (prawndpdf:master)