To separated the notification process.
Fixed to be able to intervene in the notification process.
Merge branch 'Issue10' into develop.