Made minor changes
Merged