Redhat Support

This is a merge-rebase and fixup of #19