Preparation for unit tests
Merge branch 'master' of github.com:codepeak/dsettings