added bundler support
Changed <string>.match so it works with ruby 1.8.7