formatting changes
Merge pull request #2 from bstell/master

formatting changes