Making use of pluginWidth & pluginHeight
Merge remote-tracking branch 'upstream/master'
Merge pull request #837 from simonschuh/master

Making use of pluginWidth & pluginHeight