Merge pull request #52 from dcbishop/master

Use rand in its new location.
Change from match to if for strings.