Add all machines
Merge branch 'release/v0.0.7'