added option to enable/disable output formatting