Plugins: Small changes
Merge pull request #21 from reneschuster/master

Plugins: Small changes