Minor changes
Merging