Merge pull request #20 from realraum/vm-improvements