merged branch setup_remote_driver into master