Use or '' to eliminate the need for xstr()
Merge pull request #2 from cclauss/patch-1

Use or '' to eliminate the need for xstr()