Merge pull request #334 from jeanlouisboudart/master

Fix default value handling (-u option is set making -z  fail)