fix for https://bugzilla.redhat.com/show_bug.cgi?id=1035321
Merge pull request #367 from KurtStam/master

fix for https://bugzilla.redhat.com/show_bug.cgi?id=1035321
adjusting the script for scripted use
Merge pull request #368 from KurtStam/master

adjusting the script for scripted use