Use modern notification format.
update comments and tests.
Merge pull request #7 from enulex/master

Use modern notification format.