Minor changes
Merging repos