change in branch 1
Merge pull request #1 from alanjackson/branch-1

change in branch 1
result of merge