Merge pull request #793 from Nekotekina/master

vm:: replacement 3