Updating code
Merging from origin
Fixed merge conflicts