up with git
Merge https://github.com/maxdee/fromachine