WIP
Merge branch 'v0.6.0' of github.com:PhilT/machines into v0.6.0
WIP