add events
Merge branch 'master' into crystal
Merge pull request #43 from callapatel/crystal

Crystal