Merge pull request #3 from tgieske/master

fix bug in getPluginsByContainerMerged
changes
Merge remote-tracking branch 'origin/master'
Merge pull request #3 from jed204/master

sync