first commit on mac
merge from github