Merge pull request #10 from hazendaz/master

Plugin updates.