changes for mac and win
merge with origin