Added missing load statement
added flag to flatten pdfs for thumbnail creation
resolved conflict
Merge pull request #35 from ajstanley/6.x

6.x