Merge pull request #1 from mrak/master

Updating
Added plugin task information
Merge pull request #4 from h2non/master

Wrong button...hehe