Merge pull request #1 from joshholt/master

Cosmetic changes to the output
preserve strings in quotes