adding to master from Mac