improve handling of default values
Merge pull request #21 from mlorentz75/master

improve handling of default values