merge master
mac make rules