Change signature of random_choice and random_sample. Fix a problem in random_sample. v0.2.1