Update from meolazov for vi and linux