Minor changes
Merged