Added rand
Merge branch 'what' into development