Added notification system
Fixed and merged #31.