updates to output format
Merge pull request #2 from craigulliott/master

updates to output format