Fixes
Merged upstream
Merge pull request #361 from fkalseth/indesign-integration

Indesign integration