Merge pull request #791 from Nekotekina/master

vm:: replacement 2