New version with support for Mac