Update plugin to master