Improve notification ordering
Merge pull request #4 from eandre/master

Improve notification ordering