working on random
Merge branch 'master' into random
Added shuffle feature and comments.