reformatting
Merge pull request #344 from bstell/master

reformatting