Changes in branch1
Merge pull request #1 from avandeursen/branch1

Changes in branch1