added Mac support