Merge pull request #112 from ndawe/master

[MRG] random_sample can sample histograms