Added support for systems with rvm