https://bugzilla.redhat.com/show_bug.cgi?id=1065015
Merge pull request #154 from KurtStam/master

https://bugzilla.redhat.com/show_bug.cgi?id=1065015