Minor changes
Merge