Merge pull request #76 from ziggimon/master

We need to prepare for Fedora 20 thats coming out at x-mas
Merge pull request #78 from ziggimon/master

Fixing my brainfart.