Refactoring function
Merge branch 'master' into virtio