Update to match current on master
Merge pull request #2 from Camwyn/master

Update to match current on plugins/master