team betRment merge to develop

merging sample histogram @ygoldman