Merge pull request #21 from jaimieli/comments

improved randomizing logic
Merge branch 'master' into comments