@DmZ change committed. I also added last changes for centos support.