Added OSX Notifications
Fixed conflicts