changes in branch2
Merge pull request #2 from avandeursen/branch2

changes in branch2