Merge branch '#35-ignore-user-config'