Random Number Generator M2

With suggestions from Patrice Spec.