Updated to add push notifications
Added push notifications
Removed console from notify
Updated maintainers
Fixed conflict