fix bug
Merge branch 'master' of github.com:lusentis/the-machine