update for mac
update for merge from mac
merge from mac
add test