commit on mac
merge mac and master