plugin handling change
Merge pull request #8 from iceniumsamples/master

plugin handling change