Merge branch 'master' into esegev
Added plugin info
Merge branch 'esegev'