fix problems with pdf
Merge branch 'matt_dev' into dev