Ramdon small fixes or improvements
Merge pull request #224 from aRn0D/random/fix

Ramdon small fixes or improvements