Merge pull request #4 from drscream/master

Problems by HOST_IS_SLAVE check