initial commit
Merge https://github.com/everilae/machine