Plugin updates for OSA 0.4+ release
Merge pull request #160 from Automate1/master

Plugin updates for OSA 0.4+ release