Added notifications, fixes #3