test2
Merge pull request #5 from robin-t/new_branch2

test2, fixes #3