refactor and oncomplete event implementation
bug fix on events implementation
Merge pull request #3 from ghophp/master

On Complete - Event implementation