Fix #378
Merge branch 'random'