Improve randomness
Merge pull request #1 from eboudrant/feature/improve_random

Improve randomness