Merge pull request #3 from jico/update-event-option

Option for update event
Merge branch 'master' into Added_supported_for_ng-disabled