Merge pull request #104 from gahaas/fix-machine-type

Adjustments due to changes of MachineType in V8.