Tweaked to work with latest Ruby 1.9.3.  Merged with files from old computer.