working on sampling
sampling is working
Merging release into master.