first commit on test branch
Merge pull request #1 from niekdegreef/testbranch

first commit on test branch