Updated plugins
Added tags (docs)
Merged Amix's latest changes.
Merge remote-tracking branch 'upstream/master'