pepper is ready for the new salt version (saltSample replaced by
SampleGenerator)
merged SampleGenerator into develop