Mac support added