plugin handling changes
Merge pull request #7 from iceniumsamples/master

plugin handling changes