Added support for rake and bundle