fixes #2971 - Convert all output to be tabular
Merge pull request #26 from mbacovsky/2971_tabular_output

fixes #2971 - Convert all output to be tabular