add support for custom marshaller and custom output file#589

AlphaNecron wants to merge 2 commits intoent:masterent/contrib:masterfrom

AlphaNecron:patch-1AlphaNecron/contrib:patch-1Copy head branch name to clipboard