refactored default configuration handling
Merge branch 'development'
Bring HEAD to latest.