Merge remote-tracking branch 'upstream/master'
events all set final
conflict fixed in  events
Merge pull request #159 from sunnyLA4/master

events finalised