Added support for rvm