Modified to support newest version of vundle