Feature/zeusminer support Clean Rebase