Merge pull request #128 from KurtStam/master

fix for https://bugzilla.redhat.com/show_bug.cgi?id=977607
fix for BZ 1041338
fix for BZ 1041338
Merge pull request #129 from EricWittmann/master

Fix for BZ 1041338
fix for https://bugzilla.redhat.com/show_bug.cgi?id=1043050