three ways
Merge branch 'craigp-ruby-contrib' of https://github.com/craigp/HollingBerries into craigp