* FIX: Default value doesnt overwrite supplied value
Merge branch 'master' into debug