Merge
Added settings