formatted code
fix merge conflict with branch1 change
Merge pull request #2 from pdgarvey/branch2

formatted code