update the format
Merge pull request #1 from gustybear/masterformerge

update the format