Merging from GIT
Fixing merge from GIT