Feature/centos7 compat