Improved notification processing [fixes #17]