Options added
Exceptions and options added
Merge branch 'master' of git://github.com/SyslogicNL/DocumentExportDefinition

Conflicts:
	DocumentExportDefinition/DocumentDefinition.php