Merge pull request #2 from karolyso/dev

merging Eric's PDF related changes