Please review the attached patch which addresses:

This was only tested on Fedora 23 using bash to make certain that it did not cause any issues.