Updates to switch changes over to using 2 args to support min/max
Merge pull request #95 from avanderhoorn/random-update

Updates to switch changes over to using 2 args to support min/max