c3
Merge pull request #3 from avandeursen/branch3

c3
Merge branch 'master' into branch4