Update to work with settings containing spaces

Fixed issue wherein network settings with spaces were not properly escaped.
Merge branch 'bsidhom-master'