Updated for EPEL7/RHEL7