fixes #2961 - Refactoring of output and formatters
Merge pull request #29 from mbacovsky/2961_output_refactoring

fixes #2961 - Refactoring of output and formatters