tydyed up comand options and loos formating
Merge branch 'master' of https://github.com/machination/machination