settings done mocked
Merge branch 'master' of github.com:mgm1992/Dim