Minor changes before pull
Merged