Merge pull request #5 from ka2m/master

Plugin loading improvements