events logic added
Merge branch 'master' of github.com:the21/do