fixed constructor for default value
Merge branch 'master' into develop