Added Mac support