Merged changes with my_mac branch