Cleanup
Merge branch 'master' of github.com:Programming-Systems-Lab/vmvm