Merging with changes made on Ubuntu machine.
Merge with Ubuntu machine