Pull changes and merge to MacOS version