Merge pull request #1 from eugener/master

Update code base
Do not lazily overwrite user defined values
Added comment
Do not lazily overwrite user defined values
Do not lazily overwrite user defined values
Do not lazily overwrite user defined values
Merge pull request #39 from CroniD/master

Do not lazily overwrite user defined values