Merge branch 'slimconfigure'