Merge pull request #4 from jfilak/master

Fix issues found by fedora-review