Merge pull request #233 from sunnyLA4/fresh

few events modification
final code
Merge pull request #234 from KodeKracker/master

final code
Merge pull request #235 from sunnyLA4/fresh

Fresh
Merge remote-tracking branch 'upstream/master' into fresh
few modification