Merge pull request #442 from n-shiota/master

Refactoring preparation for event notification