Rename folder
Add OS X (darwin) support