ticket:4 fix settings
ticket:5 merge t4