it dry missed indented
merge master
settings bug fixes