change in branch 2
result of merge
Merge pull request #2 from alanjackson/branch-2

Branch 2