chained a line
Added a feature list
Merge remote-tracking branch 'origin/master' into custom-event