Added OS X 10.10 support