improve .on event
Merge pull request #37 from left23/master

improve .on event