Speed up build and avoid xmlto issues
Merge pull request #192 from thotypous/master

Speed up build and avoid xmlto issues