minor changes
Merged commits