Merging changes

Merging all changes to local copy