put  monitored_machines check on a better place
Merge branch 'master' of https://github.com/mistio/mist.io