Library: Improve document parsing
Merge pull request #217 from emmanuel-keller/1.5

Library: Improve document parsing