Changed output format for issue #17