Preparing for virtualization.
Merge branch 'master' of https://github.com/vjovanov/mpde