format
Merge pull request #83 from treymarc/format2

format