small changes
Merged