Another batch of changes
Merge pull request #17 from ivannov/pdf-gen

Another batch of changes