Parameters

merging back pdf-generation changes into master branch