Change random algo
Merge remote-tracking branch 'orign/master'