Merge pull request #421 from stefan-cornelius/master

Update to 3.0.4. Fix EPEL6 build issue