merging testbranch to master

just a comment
I think there should be 4 here