Merge "Add support for macOS"