Merge pull request #40 from srinandan/master

Plugin updates