Added additional random parameters Fixes #867

Made changes as per @enejb's comments.