Removing commented code.
Adding Notifcation support. (#31)