Minor changes
merge