Merge pull request #277 from jerv13/master

Fix isse with non-array plugin values
Merge remote-tracking branch 'upstream/master'