added bundler support