fixed title problems
merged
merge