Brought latest version of code over from RubyForge :'(